From b7fd6f1e8826589646e2b0e2d7a848fc2fab3ee3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 14 Dec 2010 22:15:33 -0500
Subject: [PATCH] Remove gtk_widget_reset_shapes

See bug 637155.
---
 docs/reference/gtk/gtk3-sections.txt |  1 -
 gtk/gtk.symbols                      |  1 -
 gtk/gtkwidget.c                      | 41 +---------------------------
 gtk/gtkwidget.h                      |  3 --
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index d62fc59860..88a6d4d90d 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -4868,7 +4868,6 @@ gtk_widget_pop_composite_child
 gtk_widget_push_composite_child
 gtk_widget_queue_draw_area
 gtk_widget_queue_draw_region
-gtk_widget_reset_shapes
 gtk_widget_set_app_paintable
 gtk_widget_set_double_buffered
 gtk_widget_set_redraw_on_allocate
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 6311e46e81..bb206fa36d 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -3470,7 +3470,6 @@ gtk_widget_render_icon
 gtk_widget_render_icon_pixbuf
 gtk_widget_reparent
 gtk_widget_reset_rc_styles
-gtk_widget_reset_shapes
 gtk_widget_reset_style
 gtk_widget_send_expose
 gtk_widget_send_focus_change
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 05ea17bc9e..5053b1f8fe 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8439,10 +8439,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
       GtkStyle *previous_style;
 
       if (gtk_widget_get_realized (widget))
-	{
-	  gtk_widget_reset_shapes (widget);
-	  gtk_style_detach (priv->style);
-	}
+        gtk_style_detach (priv->style);
 
       previous_style = priv->style;
       priv->style = style;
@@ -11228,42 +11225,6 @@ gtk_widget_input_shape_combine_region (GtkWidget *widget,
 }
 
 
-static void
-gtk_reset_shapes_recurse (GtkWidget *widget,
-			  GdkWindow *window)
-{
-  gpointer data;
-  GList *list;
-
-  gdk_window_get_user_data (window, &data);
-  if (data != widget)
-    return;
-
-  gdk_window_shape_combine_region (window, NULL, 0, 0);
-  for (list = gdk_window_peek_children (window); list; list = list->next)
-    gtk_reset_shapes_recurse (widget, list->data);
-}
-
-/**
- * gtk_widget_reset_shapes:
- * @widget: a #GtkWidget
- *
- * Recursively resets the shape on this widget and its descendants.
- **/
-void
-gtk_widget_reset_shapes (GtkWidget *widget)
-{
-  GtkWidgetPrivate *priv;
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (gtk_widget_get_realized (widget));
-
-  priv = widget->priv;
-
-  if (!priv->has_shape_mask)
-    gtk_reset_shapes_recurse (widget, priv->window);
-}
-
 /* style properties
  */
 
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 5e240086f0..30fafe690a 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -900,9 +900,6 @@ void	     gtk_widget_shape_combine_region (GtkWidget *widget,
 void	     gtk_widget_input_shape_combine_region (GtkWidget *widget,
                                                     cairo_region_t *region);
 
-/* internal function */
-void	     gtk_widget_reset_shapes	   (GtkWidget *widget);
-
 GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
 void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
 					 GtkWidget *label);
-- 
2.30.2